Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Feb 2012 22:03:14 +0000 (14:03 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Feb 2012 22:03:14 +0000 (14:03 -0800)
commit2a6fe7a7d6ab4e866f77ab7616ed7436ef35661b
tree1f6c96081b648164855fc004b73cda461424777c
parente191e1a0d35dd0a2fd5078107134e00d412ef92d
parent30d567e5d2c8d62311953050fd6d8a220bde3e5e
Merge from trunk.